From: Daniel van Vugt <daniel.van.vugt@canonical.com>
Date: Fri, 7 Feb 2020 09:23:11 +0000 (+0800)
Subject: iconGrid: Avoid animating the same icon twice
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~777^2^2~167
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b5651e38c721b932f21c4bfd9514db9de9b02853;p=gnome-shell.git

iconGrid: Avoid animating the same icon twice

If the icon proper has opacity of zero then that's probably because a
clone of it is animating. So avoid animating the source actor too.

And if there's any other reason for the opacity being zero, still don't
animate it because we can't see it :)

Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/2167
---

diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index 67691c7d5..19d019f4d 100644
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -195,7 +195,7 @@ function zoomOutActorAtPos(actor, x, y) {
 }
 
 function animateIconPosition(icon, box, flags, nChangedIcons) {
-    if (!icon.has_allocation() || icon.allocation.equal(box)) {
+    if (!icon.has_allocation() || icon.allocation.equal(box) || icon.opacity === 0) {
         icon.allocate(box, flags);
         return false;
     }